From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 29 Dec 2011 20:38:17 +0000 (-0800)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1224^2~8
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5a0f296cde8a34f0ad90a3479c375e8ac011c04a;p=emacs.git

Merge from trunk.
---

5a0f296cde8a34f0ad90a3479c375e8ac011c04a